Fix incorrect indentations found by Pep 1.4.6+

Pep 1.4.5 had several bugs with checking indentation of
hanging and nested sets. Fix fallout.

Change-Id: I68878b597e138ecec2d7008380e3a9d2140d0bee
Merge "Fix incorrect indentations found by Pep 1.4.6+"