More tweaks to get the non-threaded RTS working again.