KAZOO-1539: even more refactoring goodness in jonny5