Minor bugfix on XML short-circuiting with new metadata layout.