Clean up some monster count checks