         is_do = not is_do
         if is_do
           id      = parseInt stretch, 10
-          entry   = @_ESC.retrieve_entry id
+          entry   = @_ESC.retrieve_entry state, id
           content = entry[ 'raw' ]
           send [ '!', 'do', content, ( @copy meta ), ]
         else

    $2           ?= ''
    $1           += $2
    raw_content   = $3 ? ''
    key           = @_ESC.register_content 'comment', raw_content.trim()
    return "#{$1}\x15#{key}\x13"
  #.........................................................................................................
  R = R.replace @_ESC.do_bracketed_pattern, ( _, $1, $2, $3 ) =>

      send event

#-----------------------------------------------------------------------------------------------------------
@_ESC.$expand_actions = ( state ) =>
  ### TAINT code duplication ###
  return $ ( event, send ) =>
    #.......................................................................................................
