Resolve some undefined variable notices.