Minor tweaks around namespace and imports.