Unnecessary casting.

Change-Id: Id7d9b28921e96842df1e7c0d735dba4d3dbb6156
Rename Activate... -> Attach...

Attach is the new one we are going with & offers nice contrast with
'Detach...'.

Change-Id: I4578f4c7b9d989e41d433d7c8aa96a9317aa6919
Let's not re-use the same iterator esp when it's still iterating.

Change-Id: I1752857bc036f8d389b4b71d570cf83a76ef29ea