Trader Joe’s peanut butter and almond butter recall expands