Return nil from import
Clean up conversion to list
Ensure imports are passed around arg by arg, closes #990