Hygiene: var declarations at top

Change-Id: I8aaa6aa017d460f07b4e26d42ee1cea45a05d753