Backporting recent refactoring of derivative works