Clearly indicate choices to enforce consistency.

Same with the two things below