Household factors and discrimination in housing consumption: Further developments in the analysis of tenure choice within housing careers