Use self.default instead of a dedicated kwarg