Improved proto.h-tstamp handling, including cleanup.