Having just discovered the scoping mistakes that were causing unexpected retry behavior, I think that was the real culprit behind the issue that initiated this cleanup. It definitely helps that you're changing the `shouldBuild` variable to local scope.