Switch keyexpr and locator to non null terminated strings (#602)

Switch keyexpr and locator to non null terminated strings (#602) #1636