Minor namespace fixes and standardized some type hinting.