More work towards #6.