Fixes after recent split changes.


git-svn-id: https://svn.calendarserver.org/repository/calendarserver@13337 e27351fd-9f3e-4f54-a53b-843176b1656c