Tutorial improvement (new variant of PR #12472).

Minor modifications to Axel's tutorial improvements (see also #12472).