Finish converting all callsites Not too bad actually! Centralizing access into the helpers makes a big difference.