Move helper methods into the only place they're used
WIP: test all message types