Some naked return clean-ups.