Remove pointless assertion after r190376
Fix comment to match what the assert actually enforces
Move variable under condition where it is used