Eliminated redundant code between XML and Java configuration support classes.