entry: Ensure trap after single-step on system call return