Changes suggested by @r-gaia-cs.