Simplify map expressions