Some small cleanups

Daniel Silverstonerequested to merge
kinnison/cleanups into master

Description

Some cleanups left over from the YAML new world order

There should be nothing controversial in this.

Merge request reports