This is in preparation for enabling the tests for FIR which will be easier to do when the tests are on the new infrastructure.
when
Additionally, use the line number of the class for default interface dispatch methods.