This doesn’t change how they run, but does split the code out a bit and mean we can interleave it with comments. Should make it a little less vile. Suggested by Emmanuele Bassi; see !1252. Signed-off-by: Philip Withnall <withnall@endlessm.com>