Fixes
Identity expressions that are safe to copy from
Cleanup
Cleanup