Make use of some OCaml 4.* functions
Make use of some OCaml 4.* functions

Signed-off-by: John Else <37b74501daa612e48fea94f9846ed4ddeb6a8f07@citrix.com>

rafalmiel/xen-api,srowe/xen-api,euanh/xen-api,Frezzle/xen-api,Frezzle/xen-api,thomassa/xen-api,Frezzle/xen-api,srowe/xen-api,srowe/xen-api,euanh/xen-api,rafalmiel/xen-api,thomassa/xen-api,euanh/xen-api,Frezzle/xen-api,rafalmiel/xen-api,euanh/xen-api,euanh/xen-api,Frezzle/xen-api,thomassa/xen-api,euanh/xen-api,rafalmiel/xen-api,rafalmiel/xen-api,thomassa/xen-api,rafalmiel/xen-api,srowe/xen-api,thomassa/xen-api,thomassa/xen-api,srowe/xen-api