Oops. Forgot to mark a few vars as public.