This is the last batch of cleanup patches I have in my tree before the MT patches start. Most of it is just shuffling code around so we can re-use it easier, but there are a few actual changes hidden in there as well. Cheers, Peter