Small changes: Don't reevaluate consumer priority on every delivery, refactor a touch, realign, fix test, more specific spec.