Some cleanup.  Getting around to saving expression ops and applying them after the fact