Further updates to CNetMessage processing

These could be combined with the previous commit