Fix and refactor filter_expands().