Issue #2395311: Clean up quiz form