And also apply cleanups suggested from resharper Conflicts: include/chaiscript/language/chaiscript_parser.hpp