More cleanup to custom UI node types.