Merge "Streamline code involving .= string concatenations"