Merge "Fix braino when resolving an invoke-super."