Backport (to 2.10) of 'Fixed issue #62. Handling eta-expansion correctly to allow mocks to be declared as '