Reorganize to allow the :with_deleted option to be brought over without making a given class paranoid itself. The alternative is overriding getter methods and other wonkiness from the change to the default scope