Separate parser definitions, remove extra grammars