Massive in-flux re-write. Must commit. var-params-functions support temporarially dropped.