Some clean-up after r696898 (partitioning common formula logic). Fixed compiler error in example XLS2CSVmra