Further work on ISLANDORA-1079.