Joss Whedon Also Polishing Cap Script?

It seems like Marvel Studios is really getting their money's worth with Joss Whedon. There is already talk of Whedon directing and co-writing Avengers. Now there is word from Pajiba that he's also going to put finishing touches on the Captain America script.