Cleanup some commented-out logic. Wrap thread pool map lookups with spinlock rather than just map updates.