Fixed issue #62. Handling eta-expansion correctly to allow mocks to be declared as `var`

See my comment in issue #62