Fix call loops exposed during testing.