Minor tidy ups.