Bug 981999 - Remove redundant (and not always agreeing) ways of counting sourcenotes. r=luke

--HG--
extra : rebase_source : 4c601f25e0fcc6a37e82c87a67e505b62ce3068b