Some tweakign of grammar (regarding annotations for functions and variables)