Fixup:  Get things compiling again after the previous merge.
Minor changes only.