Eliminate the somewhat arbitrary distinction between "control messages" and "events"

r? @metajack