Renamed the 'fsi' parameter used in some functions to 'isInterface' to avoid confusion between the two possible interpretations of 'fsi' (F# interface, F# interactive).
A few other minor tweaks and simplifications.