Woot! Yup, fixed! Baby steps, squashing one bug at a time.