mapMaybe id ==> catMaybes

Did I do this correctly?