Update with latest H5BP additions.