Fold both into the same subsection, and refactor how these are checked
and can be relied on. Switch the C baseline from C89 plus extensions to
C99 except specific features.