Add #521 - second attempt

Ideally there should be a test that we successfully migrate, and pick up new style values.