Fixed by adding 'static' and/or 'const' to several
variables that had neither.

Removed one obsolete comment too.

Change-Id: I8775c9a1fa8d9cc75b28619216bbe7f901117a0f