More changes to please pylint
Lost another single character variable to please pylint
More fixes for pylint. Also some fixes for subtle bugs introduced thereby.