Having the Impl suffix isn't really necessary, and if we start creating instances of these classes directly, it's also rather ugly. Let's get rid of them.
1218473