Layout specification and discovery should follow the same behavior as partials

Fixes #1047
nit: "being" -> "that was" -- location has already happened, not still happening