Merge pull request #442 from hynek/more-422

Pluck more unrelated bits from #422