Added new-style expect macro. Needs tidying up.
Moved global macro state out of main mock class.
Using protocol and partial mocks, too.
Tidying up.