I like how @parndt has split this up in #2795. Could you do that here too?