Reformat constants
Reformat constants (2)
Test NoNewGuidCodeFix

Also fix the fact that the generated call wasn't simplified