Some minor tidy ups.