Preparing BlockSubstitutionAnnotationBuilder.
Fixes for the deletion annotation builder.