use YamlDiscovery to simplify layout definitions in layouts.yml.

Seems to just work :)