A few cleanups from self CR - UnflattenAuthors() is no longer needed. Flatten() can be used more consistently.