diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index af791e5..1066c08 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1400,7 +1400,7 @@
             }
 
             if (SPACE_STATE_DOUBLE == spaceState) {
-                if (revertDoubleSpace(ic)) {
+                if (revertDoubleSpaceWhileInBatchEdit(ic)) {
                     // No need to reset mSpaceState, it has already be done (that's why we
                     // receive it as a parameter)
                     return;
@@ -1533,11 +1533,7 @@
             sendKeyChar((char)code);
         }
 
-        if (mSettingsValues.isWordSeparator(code)) {
-            Utils.Stats.onSeparator((char)code, x, y);
-        } else {
-            Utils.Stats.onNonSeparator((char)code, x, y);
-        }
+        Utils.Stats.onNonSeparator((char)code, x, y);
     }
 
     // Returns true if we did an autocorrection, false otherwise.
@@ -1870,20 +1866,18 @@
     }
 
     @Override
-    public void pickSuggestionManually(int index, CharSequence suggestion) {
+    public void pickSuggestionManually(final int index, final CharSequence suggestion) {
         mComposingStateManager.onFinishComposingText();
-        SuggestedWords suggestions = mSuggestionsView.getSuggestions();
+        final SuggestedWords suggestions = mSuggestionsView.getSuggestions();
         mVoiceProxy.flushAndLogAllTextModificationCounters(index, suggestion,
                 mSettingsValues.mWordSeparators);
 
-        final InputConnection ic = getCurrentInputConnection();
-        if (ic != null) {
-            ic.beginBatchEdit();
-        }
         if (mInputAttributes.mApplicationSpecifiedCompletionOn
                 && mApplicationSpecifiedCompletions != null
                 && index >= 0 && index < mApplicationSpecifiedCompletions.length) {
+            final InputConnection ic = getCurrentInputConnection();
             if (ic != null) {
+                ic.beginBatchEdit();
                 final CompletionInfo completionInfo = mApplicationSpecifiedCompletions[index];
                 ic.commitCompletion(completionInfo);
             }
@@ -1904,18 +1898,12 @@
             // So, LatinImeLogger logs "" as a user's input.
             LatinImeLogger.logOnManualSuggestion(
                     "", suggestion.toString(), index, suggestions.mWords);
-            final CharSequence outputText = mSettingsValues.mSuggestPuncOutputTextList
-                    .getWord(index);
-            final int primaryCode = outputText.charAt(0);
+            final int primaryCode = suggestion.charAt(0);
             // Find out whether the previous character is a space. If it is, as a special case
             // for punctuation entered through the suggestion strip, it should be swapped
             // if it was a magic or a weak space. This is meant to help in case the user
             // pressed space on purpose of displaying the suggestion strip punctuation.
             insertPunctuationFromSuggestionStrip(primaryCode);
-            // TODO: the following endBatchEdit seems useless, check
-            if (ic != null) {
-                ic.endBatchEdit();
-            }
             return;
         }
         // We need to log before we commit, because the word composer will store away the user
@@ -1968,9 +1956,6 @@
                 mHandler.postUpdateSuggestions();
             }
         }
-        if (ic != null) {
-            ic.endBatchEdit();
-        }
     }
 
     /**
@@ -2220,7 +2205,7 @@
     }
 
     // "ic" must not be null
-    private boolean revertDoubleSpace(final InputConnection ic) {
+    private boolean revertDoubleSpaceWhileInBatchEdit(final InputConnection ic) {
         mHandler.cancelDoubleSpacesTimer();
         // Here we test whether we indeed have a period and a space before us. This should not
         // be needed, but it's there just in case something went wrong.
@@ -2233,10 +2218,8 @@
                     + "\". \" just before the cursor.");
             return false;
         }
-        ic.beginBatchEdit();
         ic.deleteSurroundingText(2, 0);
         ic.commitText("  ", 1);
-        ic.endBatchEdit();
         return true;
     }