Cleaned up wrapper method which would have distributed events at the wrong time.