well-formedness fixup