Fixup improperly resolved conflicts.

These were created by inadvertendly committed the required changes on another branch and needing to cherry-pick off that branch.

Author: Peter N. Steinmetz