Merge "init: use Errorf() now that we have it"