Smash variance annotations for 7.0.x

#595 #629