Mmmh. I suppose we should indeed aim for consistency here. There might be a
way to embed the class in the method without needing to pass it as
argument, which would be nice to preserve existing API. I'll check it out
later tonight.