Simplified some function signatures for clarity and improved the StateEventWaker for a shorter simulation() function body.