Refixed and numbers optimized

Brian's probably saved this a fair few days.  Much appreciated.

The original objective is good to go, and if @glyphgryph is OK with it,
I think I can have some of these rez'd without too much trouble.  Let me
know.