Items suggested in #161 are covered.