Reformulate lemmas to ease proofs. Not finished.
Forgot a file in last commit.