[Q] Let's try that last commit again; remove some more duplicate declarations.