Shuffle around the locations of some things, eliminate some duplicate lemmas