Fix the grammar for function/tuple prototypes