Avoid some ambiguity in the specification, make some proofs cleaner.