layout: Remove `layout/extra.rs`.

Also, rename a few methods in layout that arguably had confusing names.
Merge pull request #3401 from pcwalton/refactor-layout

layout: Remove `layout/extra.rs`.