Reorganised a load of stuff, using better means of dynamic loading of
cows.