Less class, more namespace.
Maybe this time the commit for this file will stick?