break work functions out of import handler
remove else after tail call; get more PEP8-compliant
move dangling call out of the way
reverse sense of test
remember to explicitly call return, python-style
remove else after tail call
make if-tree more regular
generalise form selection
move lookup table away from logic
split import function in two
remove a bit more repetition
Merge commit 'eef4' into try-merge-latest-import-code
manual merge
Merge commit 'f9a25' into try-merge-latest-import-code
Merge commit '74dec' into try-merge-latest-import-code
Merge commit '56b74' into try-merge-latest-import-code
manual merge
Merge commit '7db5' into try-merge-latest-import-code