Some light housekeeping, changes from import_*.py/*.py merger a commit
or two back, added some TODOs.