I've been complaining (whining) about cold toes recently but this morning, my (so as to keep the NSFW police away) wedding tackle was really cold, slightly painful (I've had the mens-double bypass so I don't need to be worried about the quantity or quality of my little swimmers, just this morning's pain). I'm still wearing cycling shorts under a baselayer and running tights (double-layer lycra on the front) and my legs are fine but this morning, ouch!

Those of you who commute in near-freezing or below and wear cycling shorts in the warmer weather, do you continue to wear cycling shorts or do you wear undies or other underlayer(s)?