Fixed all ambiguities, so that from here we may explore generic parsing from a clean starting point