Make expand/collapse nicer (and a wee bit faster)