VOYEUR: Change some more types, add comments about unused variables