Simplified case statement. Suggestion from Thijs.