fix cycle check for nonstandard events.  and associated cleanups.