Make some shared stepdefs compatible with both v1/v2