Fix #2329: don't use invalid initializers.
6 files changed