fixed bugs with arrow functions; tidied up some other function definition matchers