Sorry about the TODO. I feel lost sometimes, because I worry about too much "ticket noise" but at the same time signature changes do break binary compatibility, so I don't feel ok just unilaterally making the change myself.