minor restructuring of the expression stack, it's probably going away soon.