IMO it's better to leave out the special case here and always emit if it doesn't hurt. The name of the signal implies nothing about payment request or not.