Handle non null-termiated strings better.