Added * to several list constructions in grammar to account for removal of nulls.