Adding some edits for pig 11.  Not sure if CUBE and ROLLUP are in the final spec yet.