Clean up _demo slightly (enumerate from 1)