Removed hardcoding of matches for more auto-generated code.