Minor Cucumber cleanup.