Now that we use `dash.el` `cl-remove-if-not` should be replaced with `-filter`.