Fixing banked register handling

This fixes the regressions of the last commit.