Fixup some expression simplification