Work towards #63.