Next release will be 3.0.x
Switch all pseudo-kwarg options to maps