More fiddling with parsers