Some header cleanup and annotation.
Wildcard collision and cpArbiter changes.