Proxygen: Redone switch conditional and updated xsd for it.