Aside from instance bits this is pretty straight forward. Most of the other friends were just directly accessing members instead of using accessors. Differential Revision: D953599
Jordan DeLong