Minor cleanup in clustered_services implementation