Simplify @fixture code

- Merge code for longhand and shorthand methods
- Merge the code for anonymous functions and lambdas of 2 or more
arguments

This kind of refactoring would be terrifying without tests :)