The removal of those lines conflict a bit with the planned work on issue #148, which is about removal of the multiple binaries support. I wouldn't be that invasive here, given that it might have side-effects. It would require deep testing.

I would simply extend the if condition so we it matches the one some lines above. That way we also won't have to test for .DS_Store.