barkeep: Shuffle around some logic.