Updated and simplified H5BP helpers