Simplify well-formedness criteria as discussed with Paul