Fix the ~15MB QuartzCore leak, add a couple of TODO's