Merge: Clean up constructors in core/text