Collapsing might hide the original purpose, and the bug fix.  Without a test to check for that, I preferred to keep the code expanded.