A few tweaks to assignment list.