improved DSL and error messages for expecting requests