Switch away from using context-switching #each