Changed decode definition node so that we now decode and replace sub definition nodes.