Remove use of deprecated features (#6227, patch by johnwhitington).

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14271 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02