some more changes from changes in pymbolic