Move whitespace out of <i>...</i>
Move (some) punctuation out of <i>...</i>