Fix #1573, make annotation bodies collapse correctly