Code

Make tests pass with recent git (1.7.0 and up).