added "decompose conditional" and improved "consolidate conditional
expression" to make better distinction to "decompose conditional".