Finally went through every file and adjusted pointers to explicitly strong/weak as appropriate.