R1:10773c5cb63d

Adapt to style changes; fix performance bug when loading hunks for changesets.