more gccount2.cpp updates