Refactored tactics and refactored proofs to apply those tactics.