Resolve a short  name collision (pm/elba_trio_*.ktb). (dm)
NUL-terminate a string (in apitest.c). (st)