assorted cleanup in demo13
(#590)