No need to have two identical versions of defsubst. Use the one in CXML.