OMG regexp for almost right agendas.
Improved capture templates.