More changes for “move opaque”
(From Anna)