Some refactoring from a few days ago. Mostly trying to downsize the ServiceUpdate because it is a monster of mess (the XmlPullParser logic).