cleanup - nicer message masking

The message masks have been cleaned up so that they are defined in the
header file