Fully subsume section 7 into YAML.