Make further changes suggested by Helen.

Rebase of last commit of #280 back to dev_4_4.