Update for Behat 3.0, plus nitpicks.