...or maybe always do this, regardless of whether it's truncated?
This would help with eg #986 (comment)