Fix not-trimming inverted images. Adjust var names in language::merge.