Some -DSTRICT fixes.

18 files changed