Random work towards issue #1627.