Also there's a separate "gift wrap" NIP which seems to solve the problem.