Would you believe that this finally got looked at? And then it was pointed out we could skip most of these `else` branches and let early returns do their thing.