First lazy nudge towards Issue #34.