these should not change any behavior, just make the logic a bit cleaner and hopefully easier to follow. I'm running a full regression sweep on these to ensure no outputs are changed