Cleaning up Cucumber a bit.