Changed disability removal to bitmask operators rather than -= as per Chinsky's posts in the diff.