promoting non-maybe fields to maybe-fields if needed