A bit more tidyup (primarily of ContextIOService)