Make step defs consistent

As discussed in #551