Move some entries around (staying in the same section) so that the comment is right...