Cope with larger ranges, up to /16.

  This updates #1.