Remove usage of ValueFormatters\Result

Depends on https://gerrit.wikimedia.org/r/#/c/58882/

Change-Id: I797b81aeca3c493b5ec2049154f8b598231b4cc4