And check required register number from `ci->proc` as well.
The fixes for #3859 and #3862 were incomplete.