More deletion annotation builder fixes.