DRY it up (major refactor, part 2.)  Compiles.