Fix flake8 warnings

Something must have changed in flake's code because I didn't get these
before and haven't changed the files. I'm not unsatisfied with the new
indents though.