Small cleanup that were not necessary for the critical path of my recent change, but that still seems useful.