Refactor to use trapRtnReg