Use delete_original instead of type = none

To delete tokens from source. Much cleaner and better dumps are
generated.

All tests pass.