Switch to null-terminated strings