Merge "Increase the scope of other reused definitions."