Cournot Retrouvé Under Price or Supply Function Competition