I had some trouble making the tests pass without trimming this first. I believe this should affect anything else, and might actually make the test suite slightly more portable. But let me know if you don't like it and I can remove it.