Moving over to module format that's more self-explanatory in traceback.