Fix some memory counting buglets.