Better mask fix. Since the ID is never used for anything except masking, it might as well be saved directly as a bitmask.