[#805] Simplify questionCount