Minor string cleanup...