Fix various metrics counting punctation as words