ENH: equalize call signatures, address API