The second half of the #81 fix
The second half of the #81 fix

  Accidentally didn't commit some additional changes.  This is the other half of
56028ec.

TomMD/cryptol,GaloisInc/cryptol,TomMD/cryptol,GaloisInc/cryptol,TomMD/cryptol,TomMD/cryptol,ntc2/cryptol,GaloisInc/cryptol