Merge redefinition into standalone