tweaks: adjust some comments and reduce the scope of some variables

Also remove some cluttering conditional compilation.
1 file changed