Fix last change to allow compilation with low optimization levels.