Merge "Move most mirror:: args to ObjPtr"