Small cleanup: propagate thread-localness via generic routine.