Actually removed terrible slowdown due to pointless \listadds