Minor nitpick: it's 1.8B shares. 1.15B for Fannie, 0.65B for Freddie.
I also combine FnF's share counts together when doing calculations, especially now that the CSP is up and running. I don't see a major competitive advantage for either over the other in the future.