Refactor and cleanup more namespace things.