Simplify toDataElement in MW

As per I54943588c5cc2 in core.

Change-Id: Ia40e7327c4ce07a79d64a6d5b1ff0d7acec55171
Merge "Simplify toDataElement in MW"