Further work on Dommel support. Issue #12.