Bootstrap: normalize Or and RangeLiteral