Initial changes for new YAML format are roughly in place.