VOYEUR: Fix some more shadowed variables and functions