Many tweaks to step defs and features.