Guava is moving aways from the annotations in javax.annotations because of some problems with them. We should probably do the same, and as a first step accept the new annotations everywhere where our code checks for existence of the old annotations (e.g., where we check whether something is annotated with @Nullable in Classes).