Use the new '__' instead of '?ReplaceMe' in hints