Alright, lots of random tweaks because I added a pull request to Barista
to resolve this.

This library will NOT work out of the box unless/until the Barista pull
request is accepted.  Should I need to, I will embed a barista clone (or
inject dependencies).  I hope I won't have to.