Replaced template param I by CPPParser::Statement throughout