Clean up proofs

There should be less dragons now.