Further minor tidy up.