Fix regression with lambda parameters due to verbatim identifier work

[DustinCampbell]

Fixes #119
Fixes #120

The verbatim identifier work removed a \b between the type and identifier for lambda parameters which meant that a parameter name like longParameterName1 with no type would match incorrectly. Instead, of matching as a parameter name, longParameterNam would match as a type and e1 would match as the parameter name. This change inserts a \s+ between the type and parameter name to address the fact that there's no longer a \b. There is further to rationalize all of this across the grammar.