Silly me; these should be fit.intos, to keep memory overhead down. Also I added my comments on that TODO.