I think we can fix this in a “perfect” way by having the hash map automatically use one-shot hashing when possible.
For example if the key is String, it’s hashed in one go without terminator. If it’s a compound type (containing Strings etc), it uses the current method.
hashing in one go has more upsides than just skipping the terminator; it also means that the handling for partial blocks can be omitted in SipHash for that case.
Edit: Although, the above has been attempted and no good solution was found yet.