Also, trivial improvements to the baseline example that I made while
unsuccessfully trying to reproduce a baseline bug.