Heroku-ready. Fix erroneous hairpins.