Issue #61: one more tidy