Minor, widen the scope for INSTANCE$/OBJECT$ replacement