Further ast output updates