adjust key computation to avoid trailing `-`

[compnerd]

The - suffix was being applied unconditionally resulting in a hanging - suffix if no timestamp was used. Adjust the key computation to remove the trailing - if no timestamp is used.