Order declarations in reifications in order of source line number.
The bugs still there but it bites less often now...

Also remove the type parameterisation and do some type renaming as
discussed on the template-haskell list.