Some more work on splitting up the calls.