Minor tidy up of member visibility.