Extend YAML map key special cases to nested maps

Fixes gh-208