Fix a bug I introduced.

Also clean up a sandcastle demo.