changes preparatory to use with xmlpull