Further YAML support commits

These were done a while ago per Jordan's requests on an earlier pull request. I didn't realize that pull request was still being looked at, so they weren't included.