Fixed more sequence point ambiguities.