Make arrow functions use lexical arguments