Merge in hairlines and super-annotations work.