Work on issue #24, getting rid of branch-specific D.
More work on issue #24.
Fix #24. Merge branch 'issue24'.

* issue24:
  More work on issue #24.
  Work on issue #24, getting rid of branch-specific D.