Layout specification and discovery should follow the same behavior as partials

Fixes #1047
"would" -> "will" or "would be" -> "is" (and at line 51)