Link back from demo to source.
Drop unclear commented out TODO.