(Hopefully) fix #67: allow onNewIntent to cancel, now that it's easier. Also fix a crash on cancel.