refs #2703: Update XML generation, remove some hardcoding