Remove deprecated expect ... should use.