Finegrainify namespacification, minor cleanups