KAZOO-3064: refactored updaters for less anon funs