Bug 1022461 - Follow-up to bug 983812, add comments wherever we dispatch