More completion work

Also forward-ported dylan example.