normalize regular and eager calls