Minor redesigns to Expression types in preparation for stacking atoms.