Clean up string parsing a tiny bit.