This new look fits better with the new behaviour. Also, the
collapse/expand markers are now drawn by the style.