Small clean-up of status switch statement.