A little more work on #336.