Predicate formatters for arity=1 and arity=2

Some incremental changes to other snippets