Expand on r91123 Article refactoring: