tree/diff header cleanup.