Improved parser.