Fix layout initializers

Finishes #91.