I more or less know what needs to be done to remove this case, but I have a few other refactorings that need to be done before it is possible.