Adapted stuff to new D_Parser APIs.