Avoid #8286, add Bool support.