Add more Model type hints, and ease the model testing replacing
is_object() for  '!== null'.