[x86/SLH] Sink the return hardening into the main block-walk + hardening