After today's email by Flickr it is even more unlikely that I will rethink my decision to not upgrade to Pro. They do not seem to really care about the normal/free users. Not sure that Pro user's discounts are really that useful.
@33MHz Yes. Also - if reading the TOS correctly - your account can be terminated due to inactivity. And if you have more than 1000 pics as a free user, they'll get deleted back to 1000 in February.
Also had to find out (hidden somewhere in the forums) that the Creative Cloud 15% discount is an only-once offer for new customers. Existing CC users cannot use that discount. And it's only for the first year.