Another catchup to CM device tree

Only where it's needed.