Removed "isrx" parameter whose only purpose is to trigger an assertion on DEBUG builds. Also performed a minor refactor.