Stop doing dot-imports; clean up code.