I was toying with the idea of having a decorator to get the behaviour in both methods - but that has a complication in that it is harder to document. I think it is fine to go ahead and apply to barbs too. Might be that we can factor some of the code into a helper while we're at it.