Redo the boilerplate / splat

[SeeRM #8496]