Un-hide R_inspect and R_inspect3
Merge branch '21-misc-cleanup' into 23-extra-sub