[squash] Clean up message set decoding work