Clean up of several classes, and conversion of XMLProperties into a []-class.