objects: method switch
xml: minor cleanup