I'd be inclined to merge them, yes - so long as `allow_none` defaults to False, there's no reason to subclass TraitType directly and bypass AllowNone.