*REALLY* fix 'marks' and 'index' lists.