fixup 91b4c80: convert one more use case as well