Improve XQuery editing support.