More tweaks to text_as_statement