also while we are cleaning this up, it would be nice to move away from this pattern match and use `?WHENFAIL` instead.