Further minor tidy ups.