Follow up on return intrinsics tightening the preprocessor checks and using the declared version of the intrinsic instead of declaring it ourselves.

Addressing a post-commit review by @alexrp.