unwarper: Fix some special expression cases
test: add more testcases from X:R files