[Azoth CH] Support wrap-around for #1599.