Various minor variable/hook cleanups.