WP-2472: add handle wrapper.