Fix for issue #106.
Simplified macro state.
Class mocks delegate to recorder for auto-switching with macros.
Further simplified interaction between mock and macro state.