Comment.
Comment.
Stuff extracted from Zen and MedMan.
Conform to name changes elsewhere.