Some minor enhancements to the test-/example-program.