Clarify server events. Closes #2218