Move more PEAR deps to composer