Change the order of 3 functions, there are no other changes. This will make subsequent commits readable.
Change the order of 3 functions, there are no other changes. This will make subsequent commits readable.

sparkslabs/kamaelia,sparkslabs/kamaelia,sparkslabs/kamaelia,sparkslabs/kamaelia,sparkslabs/kamaelia,sparkslabs/kamaelia,sparkslabs/kamaelia,sparkslabs/kamaelia,sparkslabs/kamaelia,sparkslabs/kamaelia