Fix build, remove extra toIntUnsigned calls

One small change to fix the build.
One small change to remove some calls to toIntUnsigned that appeared to be unneeded.
Tests still pass with the calls removed.