Merge "Factor out calls to apexservice in a class."