Yet more nitpickery over code cleanliness