Lots of backup refactoring.