Fixes to cleanup list shifting.