Not related to this change, just a cleanup...