saner import syntax in preprocessor
make the preprocessor a little faster

This reduced the preprocessing time from 8s to 2.7s.