BUG: Consistently invoke MarkupAddedEvent specifying the markup index.

@naucoin  Could you review this ? Thanks