Some cleanup, moving toward quasiquote match forms
Parses import statements