Layout specification and discovery should follow the same behavior as
partials

Fixes #1047