Reintroduce SFINAE-based selective enablement of &=, |=

...they had erroneously become unconditionally enabled.  Also, rename Self to
Wrap.

Change-Id: I574662012bf74114b18f3bab0c1c5825a2bd61bb