Removed all anonymous functions. Relates to #17