Making the contexts a bit more spec-y