General clean-up. Deprecate compose and kDiff. Rename: diff -> dX