REFACTOR: Improve rigor of marking.

Not required as these fields are marked elsewhere.
UPGRADE: mpr pak

Cleanup only.
REFACTOR: tracing.

Improve messages. Add message to allow discrimination.