Cleaned up parser. tests maintained.