Further fixes to assignment passing