I would already opened a Pull-Request in Ashikawa, but apparently this is not very easy to do. I could not come up with a better solution than this one. If this is fine with you, we could move the functionality over to Ashikawa.