Avoid some indirections in LAYOUT-OF