[committed] Fix rv32 issues with recent zicboz work