Revised Methods for Characterizing Stream Habitat in the National Water-Quality Assessment Program