Fix the issue that r143552 was trying to address the _right_ way. One-register lists...