Tie down category counting a bit better.