Prior major change backup point.

Check-in files before major overhaul of layout, namely making the types
for the subprogram-parameters dependent on the generic.