Advances in Using Grammars with Latent Annotations for Discontinuous Parsing