snippets: more incremental snippet work.