I've dropped the comments,  as they are used externally.