Some adjustments to simplify customer meta code.
Upgrade routine for exising user meta entries.