fixup! Simplify some expressions