+5 func
Fix bug in ExpandImport

It failed to expand import if the identifier was the only expression on
the lhs of an assignment, e.g. `a = cos`
+6 funs