Attempt to reformat code a little to make PEP0008 happy.