Merge "Clean up IntToStrings for window TYPE_*"