Discard trips properly when that option selected after trip completion.  Fixes #13.