Message codes no longer monotonically increasing integers, let's adapt
Support incrementing and returning values, beefcake