Frayling has said that by the time of GBU, Leone was already thinking about making OUATIA.Perhaps the mausoleum is a bit of unintentional foreshadowing
better question -- how could Angel Eyes sneak up on Blondie & Tuco in a huge open field where there are nothing but graves as far as the eye can see?