Don't use random span for holding data, use a variable
Clean up control flow around no-statement-found error.