Switch keyexpr and locator to non null terminated strings

Switch keyexpr and locator to non null terminated strings #1626