-#define LDAP_FILTER_AND (ber_tag_t) 0xa0U /* context specific + constructed */
-#define LDAP_FILTER_OR (ber_tag_t) 0xa1U /* context specific + constructed */
-#define LDAP_FILTER_NOT (ber_tag_t) 0xa2U /* context specific + constructed */
-#define LDAP_FILTER_EQUALITY (ber_tag_t) 0xa3U /* context specific + constructed */
-#define LDAP_FILTER_SUBSTRINGS (ber_tag_t) 0xa4U /* context specific + constructed */
-#define LDAP_FILTER_GE (ber_tag_t) 0xa5U /* context specific + constructed */
-#define LDAP_FILTER_LE (ber_tag_t) 0xa6U /* context specific + constructed */
-#define LDAP_FILTER_PRESENT (ber_tag_t) 0x87U /* context specific + primitive */
-#define LDAP_FILTER_APPROX (ber_tag_t) 0xa8U /* context specific + constructed */
-#define LDAP_FILTER_EXTENDED (ber_tag_t) 0xa9U /* context specific + constructed */
-
-/* U-Mich version 3.0 compatibility filter types */
-#define LDAP_FILTER_PRESENT_30 (ber_tag_t) 0xa7U /* context specific + constructed */
-
-/* old broken stuff */
-#define OLD_LDAP_FILTER_AND (ber_tag_t) 0x00U
-#define OLD_LDAP_FILTER_OR (ber_tag_t) 0x01U
-#define OLD_LDAP_FILTER_NOT (ber_tag_t) 0x02U
-#define OLD_LDAP_FILTER_EQUALITY (ber_tag_t) 0x03U
-#define OLD_LDAP_FILTER_SUBSTRINGS (ber_tag_t) 0x04U
-#define OLD_LDAP_FILTER_GE (ber_tag_t) 0x05U
-#define OLD_LDAP_FILTER_LE (ber_tag_t) 0x06U
-#define OLD_LDAP_FILTER_PRESENT (ber_tag_t) 0x07U
-#define OLD_LDAP_FILTER_APPROX (ber_tag_t) 0x08U
+#define LDAP_FILTER_AND ((ber_tag_t) 0xa0U) /* context specific + constructed */
+#define LDAP_FILTER_OR ((ber_tag_t) 0xa1U) /* context specific + constructed */
+#define LDAP_FILTER_NOT ((ber_tag_t) 0xa2U) /* context specific + constructed */
+#define LDAP_FILTER_EQUALITY ((ber_tag_t) 0xa3U) /* context specific + constructed */
+#define LDAP_FILTER_SUBSTRINGS ((ber_tag_t) 0xa4U) /* context specific + constructed */
+#define LDAP_FILTER_GE ((ber_tag_t) 0xa5U) /* context specific + constructed */
+#define LDAP_FILTER_LE ((ber_tag_t) 0xa6U) /* context specific + constructed */
+#define LDAP_FILTER_PRESENT ((ber_tag_t) 0x87U) /* context specific + primitive */
+#define LDAP_FILTER_APPROX ((ber_tag_t) 0xa8U) /* context specific + constructed */
+#define LDAP_FILTER_EXT ((ber_tag_t) 0xa9U) /* context specific + constructed */