Also make generation more selective (require opt in) to prevent lots of
unnecessary generated deep copies.