Refactored splitting rules.  Fixed up some proofs.