Trivial renames, and prune some dead code.