Delete TODO notes (The syntax here is the reverse of the (old, new) pattern in most other validation. Fix this.)