Make the logic for active events work better with internal events; patch from Christopher Layne svn:r509