Some more cleanup
Get rid of __add__s
Make ImportWriter.visit directly return output