Simplify a boolean check in Evaluation.IsExpression.cs. typeToCheck is already tested for nullity. Also correct a ternary statement in ImportStatement.cs. Previously it would have been evaluated as ("module " + ModuleName) == null ? "" : ModuleName.ToString(). Which seems to be incorrect. (ie) why check for null, when you've already added it to the string.