Don't pollute namespace unnecessarily.
Overhauling to simplify code, and make configuration less awkward.
Dead code.
Support Cucumber a bit more gracefully.