a couple of hxml highlighting/completion fixes