This looks like it would fix on just two lines in < 80 chars.