Fix check-subforms and reenable TR contracts.