More collection specs and improve example context handling.