Small code errors left behind when changing implementation of next