Cleanup formatting to match improved pylint indention testing.