More tweaks to UNGAP.