Credit myself
More generic name for main event
key detector’s block handler set up at construction
Move OCMock around, kill refs to local filesystem.