Cleanup - wrote this in a rush :)
Replace copy-pasting with list comprehension

Also, a comment that explains why (for ...) didn't initially work in
this case. Lesson learned: (= (+ mutability laziness) pain)