Fix some broken #states code using a fancy OR logic.