Little cleanup.  Still getting different results than the 2.8.4
implementation, but this version has some fixes from Christian
that were not in the 2.x version.