Test that legacy tombstones can be dropped

Also, clean up tombstone macros a bit.