CDeclUse Refactor - Clean up Declaration Mapping