         return wholeEvent(with: eventData)
     }
 
-    private func newLog(_ action: Action, _ domain: String?) {
+    private func newLog(action: Action, domain: String?) {
         /*
          * TODO: The following still need to be resolved before this
          * instrumentation upgrade can be called done:
          *   - Finalize stream name to what will be deployed in mediawiki-config/wmf-config
          *   - Finalize the schema (TBD in Gerrit patch to schemas/event/secondary repo)
-         *   - Decide if this approach is preferable to explicit EPC.shared?.log()
-         *     - PROS: less verbose; see logShowHistory() below for comparison
-         *     - CONS: have to do this step to ensure that newLog isn't Optional
          */
         EPC.shared?.log(
             stream: "ios.edit_history_compare",

    public func logRevisionView(url: URL) {
        log(event(action: .revisionView), language: url.wmf_language)

        newLog(.revisionView, url.wmf_site?.absoluteString)
    }
    
    public func logCompare1(articleURL: URL) {
        log(event(action: .compare1), language: articleURL.wmf_language)

        newLog(.compare1, articleURL.wmf_site?.absoluteString)
    }
    
    public func logCompare2(articleURL: URL) {
        log(event(action: .compare2), language: articleURL.wmf_language)

        newLog(Action.compare2, articleURL.wmf_site?.absoluteString)
    }

    public func logThankTry(siteURL: URL) {
        log(event(action: .thankTry), language: siteURL.wmf_language)

        newLog(Action.thankTry, siteURL.absoluteString)
    }

    public func logThankSuccess(siteURL: URL) {
        log(event(action: .thankSuccess), language: siteURL.wmf_language)

        newLog(Action.thankSuccess, siteURL.absoluteString)
    }

    public func logThankFail(siteURL: URL) {
        log(event(action: .thankFail), language: siteURL.wmf_language)

        newLog(Action.thankFail, siteURL.absoluteString)
    }
}

    public func logShowHistory(articleURL: URL) {
        log(event(action: .showHistory), language: articleURL.wmf_language)

        newLog(action: .showHistory, domain: articleURL.wmf_site?.absoluteString)
    }

    /**
