shelving expression enhancements

this isn't expected to build
mistakes from last commit