Post #11186 simplification and comments.