Fixes synthDef- and enviro-related merge policy issues.