Finished reworking the problem refactorings.