Deal with data constructors from explicit imports
Tidy up