Miscellaneous code clean up in the step definitions.