This contains no change in logic, but is preparation for cleanup and possible alternative strategies.