More tweaks to make schema conform to ARIA spec.