Simplified how Metadata is Stored on Types Which Support Forward Declaration

Simplified how Metadata is Stored on Types Which Support Forward Declaration #4254