CSH-1525. needs more transform rules