Was using the wrong node when iterating; also the tricky case of empty
or without-end hints at the start of an extent was wrong.

MergedAttrIter also shouldn't include wihout-end hints and non-empty
hints at the end of an extent.

Change-Id: Ia0776c1d3043cbd6d76fa04905b4937ebba53398