First step towards Issue #40.