Fold in @heathd's comments