Cleanup quoting in include/import