Fix circular argument reference warnings