Created by: mrnugget
This does some tiny, tiny refactors that I came across while trying to find out whether we can't add concrete counts to the messages instead of saying "Some".
It also changes two messages to have a concrete count in them.