Ok, makes sense! @julianoes @thomasgubler Could you review these changes? I'm hoping that we can digest the bulk of them via code review and can get away with a normal level of testing, instead of having to blindly test for weeks all of the possible combinations.