Crashfix copying text with invalid shape-inside reference

Smaller fixes taken out from Thomas Holder's refactoring
in commit ce0ba230

Fix #2450
Fix #1955