More general way of adding parsers & XML for 2.11.