index: Combine class attributes

Can't believe I missed this the first time through.