A lot of changes to get timed messages work from stateful handlers