Rough pass SingleArticle reorg and cleanup.