anchor.diff:              State9 = touch_qbuf(QBufRef, State0),
               {reply, {ok, {existing, QBufRef}}, State9};
           {ok, {new, QBufRef}} ->
  -            if TotalSize > SoftWMark ->
  +            case TotalSize > SoftWMark of
  +                true ->
                       {reply, {error, total_qbuf_size_limit_reached}, State0};
  -               el/=se ->
  +                false ->
                       DDL = ?DDL{table = Table} = sql_to_ddl(OrigDDL, SQL),
                       lager:info("creating new query buffer ~p (ref ~p) for ~p", [Table, QBufRef, SQL]),
                       case riak_kv_qry_buffers_ldb:new_table(Table, RootPath) of
  
positive.code:                                ddl = ?DDL{table = Table},
                                 last_accessed = LastAccessed}}) ->
                    ExpiresOn = advance_timestamp(LastAccessed, IncompleteQbufReleaseMsec),
                    if ExpiresOn < Now ->
                            ok = kill_qbuf(RootPath, Table, LdbRef),
                            lager:debug("Reaped incompletely filled qbuf ~p", [Table]),
                            false;
                       el/=se ->
                            true
                    end
            end,
  
negative.code:                                expire_msec = ExpireMsec,  %% qbuf-specific, possibly overriden
                                 last_accessed = LastAccessed}}) ->
                    ExpiresOn = advance_timestamp(LastAccessed, ExpireMsec),
                    case ExpiresOn < Now of
                        true ->
                            ok = kill_qbuf(RootPath, Table, LdbRef),
                            lager:debug("Reaped expired qbuf ~p", [Table]),
                            false;
                        false ->
                            true
                    end;
               ({_QBufRef, #qbuf{is_ready = false,
  