Cleanup: Move pimps to a different object.