more consistent ordering of manual token type

closes ocamllabs/rwo-comments#2237