Style corrections

My indentation differs a bit from PEP8 (because I indent continuation
lines twice under most circumstances, triggering E126).