make if-tree more regular
Merge commit '17bc' into generalise-importers