More work on libmergeimage