layout: Remove `layout/extra.rs`.

Also, rename a few methods in layout that arguably had confusing names.

r? @glennw
nit: extra space here