Fixed another old name remnant in reinclusion guard names.
Changed name of macro for critical blocks.  Changed names of inner variables to avoid easy collisions with "real" variables.