Have simple arrow functions have a parameter, not an identifier.
Removing dead code.