Better Approximate Inference for Partial Likelihood Models with a Latent Structure