No more `NewBase` horrors. Thanks to bendavis78 for his work on merging this into six. Backport of a2340ac6 from master