[#33] Cleaned up some parser code.