Matt's recent improvements, slightly edited.