Generalize Argument depth adjustment for supers nested in blocks