Further work on StraightList. Some refactoring.