Slightly better (but cube_calltree sucks)