Last Modified: $Date: 2008-07-02 15:12:08 -0700 (Wed, 02 Jul 2008) $

 * properly test bitmask combinations so I don't get egg on my face
   again.

 * clean up macros.


