Remove die!, raplace invocations with fail! Issue #4524 pt 3

This is the final part of Issue #4524, all tests are green