diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 071941ff72..cd672a878c 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -620,12 +620,11 @@ __dyn_install() {
 
 	# record build & installed size in build log
 	if type -P du &>/dev/null; then
-		local nsz=( $(du -ks "${WORKDIR}") )
-		local isz=( $(du -ks "${D}") )
-
 		# subshell to avoid polluting the caller env with the helper
 		# functions below
 		(
+			local nsz=( $(du -ks "${WORKDIR}") )
+			local isz=( $(du -ks "${D}") )
 			# align $1 to the right to the width of the widest of $1 and $2
 			padl() {
 				local s1=$1
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index e07d27e8fc..049c5fa169 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -1746,7 +1746,7 @@ def __getitem__(self, key):
             # Preserve the order of var_split because it can matter for things
             # like LINGUAS.
             var_split = [x for x in var_split if x in expand_flags]
-            var_split.extend(expand_flags.difference(var_split))
+            var_split.extend(sorted(expand_flags.difference(var_split)))
             has_wildcard = "*" in expand_flags
             if has_wildcard:
                 var_split = [x for x in var_split if x != "*"]
@@ -2204,7 +2204,7 @@ def setcpv(self, mycpv, use_cache=None, mydb=None):
                 # "test" is in IUSE and USE=test is masked, so execution
                 # of src_test() probably is not reliable. Therefore,
                 # temporarily disable FEATURES=test just for this package.
-                self["FEATURES"] = " ".join(x for x in self.features if x != "test")
+                self.features.remove("test")
 
         # Allow _* flags from USE_EXPAND wildcards to pass through here.
         use.difference_update(