Move a bunch of stuff out of *_impl modules.