Found by Valgrind while looking for another bug...

Hmm.. I should really just make this code generic since
they're duplicated...