Fix notices from r94259 due to undefined variables