Initial modifications for @extend-only usage.