[m-rev.] for post-commit review: fix mantis bug 480 (mostly)

[Zoltan Somogyi]

For review by Peter.

I intend to fix the remaining situation identified by an XXX in the diff,
but not today.

Zoltan.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Log.480
Type: application/octet-stream
Size: 649 bytes
Desc: not available
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20190805/5127523e/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: DIFF.480
Type: application/octet-stream
Size: 4313 bytes
Desc: not available
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20190805/5127523e/attachment-0001.obj>