Updates to spri to actually manage redirects from application code correctly.  Previously, the indirect branch target and the 'old' instructin's address were confused as to what was being redirected.  This should be cleared up now.

Former-commit-id: 5465a37bbec1c94571d3c33fa07a493f826972be