Most of the proposed fixes are ones I agree with in spirit, but implemented a little bit differently in practice.