Remove some dead code, conditionally declare some items or call some code, and fix one or two declarations.
