Add XML parsing support for extensions.
Tweak the TODO.