Tweaks to merge_props and props printing