#416922 by Darren Oh: Fixed upgrade for existing fields. #434920 by Darren Oh: Fixed argument defaults being lost on save.