Minor cleanup.
RISC.v seems to have it different.