Tightens parser code