Minor cleanup to use ->inNamespace()

Change-Id: Ifc9850089b3c142c570ccacc461a641b1665467e