[FIR] Fix diagnostics for interface companion block members