Updates and simplifications to mpfr golden model