…and Warwick Davis himself has confirmed that they used him as a kind of Yoda stand-in for one scene in TPM, walking in a long shot, and obviously it was kept in the movie, and that whole sequence with fake-Mace also, seems kind of botched together, perhaps last-minute. Been a long time since I managed to sit through the whole ending of TPM.
It seems like the entire Fake Mace scene was shot in reshoots, probably to make the ending feel less abrupt.