More work on Xtensions.
Bug fixes for Xtensions.