More progress on Pegex conversion