Fix a couple bugs in the nullable support.

- Don't change `type: null` to `type: [null]`.
- Don't blow up when there is an actual property named `type`.