Replaced success with whatever in a few places.