Improve fresh function so that each type of identifier prefix (var, cont) has its own counter
Merge