Fix doctests to comply with new type model.