xEvent vs. InternalEvent confusion still reigns though. Signed-off-by: Daniel Stone <daniel@fooishbar.org>