ERT-606: Simplified argument resolve code