Yep. I was right. In his speech about the hurricane last night he mentioned both 9-11 and terrorism. Observe:
    ”Four years after the frightening experience of September 11th, Americans have every right to expect a more effective response in a time of emergency.”

    ”In a time of terror threats and weapons of mass destruction, the danger to our citizens reaches much wider than a fault line or a flood plain.”

    Wow.