Absolutely agree. Although I think it's implied that he's gotten over that hang up when he basically asks Nasir to stretch out Yoshi for him.
*whispers as an aside* in that case he should follow through even more!