Fixed regression in formatting ROLLUPGROUP

There was a regression introduced in the implementation of new arguments for ROLLUPADDISSUBTOTAL and ROLLUPISSUBTOTAL that was not formatting expressions containing ROLLUPGROUP.