Minor string refinements