Fix a corner case with +call, &attributes, block