Homogenize buffer identification between base and indirect buffers

Request #98 should be dropped in favor of this one.