Ping @RalfEggert. Looks similar to your approach.