Back up the $ip to before the trap instruction and fix tests.

This gets breakpoints working with regular syscalls *without* the filter lib.  Tracing with the filter lib still trips an assertion.