Ok, updated the comment. Longer-term I'll work with @dgoodlad on trying to get this stuff all a bit better and in sync. If I'm able to move more stuff to taps and make it so we can build bottles for them a bit easier then we may end up aligning here.