Remove another unneeded null check
More neatly match questions to survey structure