- Aligns RoCC with #1232. - Fixes #1268. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>