I was wondering where you got your inspiration for 2 - after this post might I get it too? Presumably the answer is the forename changed as per the word in clue 6 - correct?
30 indeed has a superfluous word and it links with 17. For 13, the last word is the anagram indicator, the first (third actual) the def. and the penultimate indicative.
Thank you, guys. That solution to 13 had crossed my mind but I couldn't unravel the convolutedness of the clue. And 17 in its unaltered form was my first one in, so - as it happens - I couldn't see the necessary change.