Prepare for eliminating clone callback prop use.
Add a check to avoid a possible segfault.
Eliminate use of properties for clone callback.

Still a reference in the setting, but that can go away with a bootstrap
update.