Work towards #6.