and here, too: Add extension points to XML schema definitions where feasible, closes #515