Export Packet Constants and Fix AddOption input clobbering.