Fix string continuation and a few pep8 issues.

I'm not sure this file even parsed before, and I don't know how
it got past jenkins.  Its presence was causing pep8 tests to
fail for any subsequent patches.

Change-Id: If0ed48a8899bc7a59b8fbf3dea42ade5daa3c5f6