Changes made during revamp of cscope code