Tweaks to new text_as_statement labels