Rearranging to get rid of the trac version branches

This version works on trac 1.0 (though it will probably work on trac
>= 0.12).