Regex magic to combine two step definitions - steps unaffected