MDL-66147 mod_assign: Change assign to return calculated instance data