Hoping the next PR is just around the corner (don't want to use that other word that starts with an "s" - heard it enough) makamai