Issue #189: Fix something weird that's been there for ages.
Issue #189: Some more feedback.