CDeclUse Refactor - Optimized Pattern Matching