Further refinements to the output formatting; cleanup routine for example blocks.