+1.  While I don't particularly like the 'whitespace-abundant' style, I think local consistency should trump PEP8 here.