A bit of xcodesupport cleanup