Some more tidying while chasing down an exception that seems to have decided to disappear.
Merge branch 'nixta-working'