Minor refactoring of my last patch
related to // rdar://12958878