Further changes to split the old cogeco specific stuff out.