Are these changes necessary or just a cleanup (more explicit)?