demo.html: Cleanup and optimization.