OpenMP optimizations: Use 'atomic' instead of 'critical' when
possible. In oldoffice, keep using critical but make it a block.