Fixing some suboptimalities with Block subsitution annotations