Update assignment code to take account of new 'assign' module