WP-2370: preliminary metadata wrappers.