Tweaks to FORCE_SINGLE_THREAD behaviour to catch and process more event
types