Issue #3496607 by alexpott: Make return value of stopEvent consistent and the code less tempting to change
