Merge "Optimizing: Clean up after const-string sharpening."