More back end refactoring.