Some de-engrification, documentation, and note about non-public method mocks.