Convert unnecessary pattern matching to map(..).get