define more macros (converted most shorewall macros)