Add support for singularizing sub-nodes.