Get rid of some redundant parser types.