Make declare string template match generated string
Add Cursor::WITHOUT_HOLD for consistency