Fix imports of "modules",
required after converting everything into dictionary returns.