Funny thing is, I added that prior to the tests, then in the test I skip over them for the heap. I'll remove this entirely.

Once I've gone through the other changes, I'm going to create a new history for this patch set to make it cleaner, since it's now getting long and straggly. :)