Resolve some suggestions from hlint

No logic changes, just remove some redundant brackets and swapped
`catMaybes $ map ...' with mapMaybe as suggested.