Renamed SimpleOrderWithBuilder and MassOrderWithBuilder to simpler MassOrder and SimpleOrder name forms (after removing older things with that name).
Minor naming touchup (args --> ctorAndArgs).