Eww, that is not pretty.
This is probably going to be a very low priority bug, as it will be rendered obsolete by Bundle: Hackable, the most likely next Bundle to be worked on. However, if anyone wants to dig in and fix this sooner, a PR would be welcome.