Minor Roslyn changes