Fix another small potential hygiene issue