Cleanup and build fixes.
Add an echoed 32-bit token field to command packets.