Hygiene: Fix (potentially) undefined variables

Change-Id: Idff90f103bc6af6b0133676a6b40ac36e5b9fe13