#320: misc cleanup