Some speedups (imports to local name space etc)