More cleanup of the simple-exercise example