cleanups for text; simplify SyntiParameter
merge master