I opted for the latter suggestion in the end, given that BufUtil was the only user