Cleaned up some step definitions.