This allows us to run tox -epep8 on newer python versions. Fix the issues newer hacking calls out. They were complaints about indentation and ambigious l value variable names. Change-Id: I9552fba791bdf54649fbe25fc26bffdf8186ff0a