Fix a regression in retaddr calculation on x86-64/x86-32.

This issue was caught by the unit tests.

Issue: PLCR-499