Added several more macros for the wire protocol.