Improve parsing somewhat.