Merge "Code cleanup: unify writeNormalizedNode functionality"