Fix global of CURRENT_VERSION + other things that pylint points out

Per a comment in #1955 -- a fix for CURRENT_VERSION
Plus a few similar fixes pointed out by pylint.