Just watched the extras on Ark In Space Special edition,
The film footage of Tom Baker visiting Belfast. I'm sure the reporter asks him if he will regenerate again. Maybe a flipant reply but I'm sure he says he is contracted for 20 years.
That would have taken him up to the McGann movie.
Would have suited me but there might not have been a Redbeard Rum in Blackadder.