Update to 1.5.8

Our tests pass, so we can probably upgrade to 1.5.8 safely.