Refactor xquery hint.