Better handling of uset values in package.