Patch 1 is a bit of an RFC -- I'm not 100% sure about it, but hey, all the tests pass. I'm also open to discussing alternatives to patch 2. The largefiles match override code seems messy in general, with all four overrides doing something different.