Bug832

This implements bug 832 which is a cleaning work on PACKET macros.