Tidy up overlay declarations
Use strand::running_in_this_thread instead of bool