adding a closure is fine, but re-indenting everything in the same commit makes it really hard to read what changed here. I could read as ?w=0 but then I can't comment on the commit.