This removes the last of the requests for gopkg.in/yaml.v2, and
also the struct annotations.

Closes #1192
Closes #1263