Use Layout::extend and clean up code around alloc

Use Layout::extend and clean up code around alloc #2547