Fix enum Self type in match statements and circular dependency

Fix enum Self type in match statements and circular dependency #6505