I've only got one pump - underneath and in front of the RH rear wheel arch. I am 99% positive there is no in-tank pump. Mines a 2004 and I think when they deleted the underbonnet pump the in-tank pump went too.
I do not consider that it was an improvement as it's a bitch to change - whether the pump or the filter.
Lying on your back with diesel running up your arm is NOT funny.
As others have said - I'd like to have just 5 minutes alone with the 'designer-engineer' who did this, in a empty room with a baseball bat.
Thank you - end of rant.