This includes a potential soundness fix as well as some improvements to performance which should be helpful.