x86: replace off-by-one OTMax