Improvements for rebel.xml generation logic.