Fix a couple of harmless singleton variable warnings in the compiler introduced in a recent commit