clean up import highlighting and allow "import Foo as F"