Wilcox fixups.
Added reuse of same initialization points.