1. remove all useless macros from the proc header file 2. merge 2 of the match macros (they share the same logic except one list) This commit was SVN r8946.