basic cleanup on carousel example (fixes #9709 and #9700)