Mmilton master

Only in f24e501 do I start to change the code semantics.  The rest is formatting/cleanup.