Fixed remaining dependency on gridlock events. Closes #23.