Minor cleanup, mostly a parser update.