Code IntelliSense Improvements

In particular, don't crash whenever you save any CS file.