Patches provided by Joel Baker in PR 22364, verified by myself.
(including Pica, NEC RISCstation/RISCserver).