Then OK to merge the `AllowNone` class into `TraitType`? I did it this way because there was no validation logic in `TraitType` (but since `allow_none` is turned off by default I guess it's harmless).