Can this be spread over several lines to aid review (see comment on the other PR). This applies in a few places. I'll finish my review once this has been done, but generally I like what you're doing!