More performance improvements
forgot part of the elseif and switch xsd changes.