I wonder if it wouldn't make more sense to be explicit about the `Buffer` path here