Minor custom tweak: Build the second tree just once